8361487: [ubsan] test_committed_virtualmemory.cpp check_covered_pages shows overflow #28151
Conversation
|
👋 Welcome back azafari! A progress list of the required criteria for merging this PR into |
|
@afshin-zafari This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 154 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
|
@afshin-zafari The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
| static constexpr int PAGE_CONTAINED_IN_RANGE_TAG = -1; | ||
| static constexpr bool IS_PAGE_CONTAINED_IN_COMMITTED_REGION(int a) { return (a == PAGE_CONTAINED_IN_RANGE_TAG); } | ||
| static constexpr void SET_PAGE_AS_CONTAINED_IN_COMMITTED_REGION(int &a) { a = PAGE_CONTAINED_IN_RANGE_TAG; } |
There was a problem hiding this comment.
The functions aren't constexpr, so you can skip those. I think all of these can be in this_style_of_naming instead.
| if (is_page_in_committed_region(page_num[index])) { // Already tagged? | ||
| continue; | ||
| } | ||
| address page_addr = base + page_num[index] * page_sz; |
There was a problem hiding this comment.
What if we assert(page_num[index] >= 0) at this point if we know that negative numbers may cause overflows?
There was a problem hiding this comment.
Negative numbers are not bug/invalid. They are used as a marker that the page is inside a committed region.
In the test we list/iterate all committed regions of a reserved memory are. For each committed region we check a list of pages whether the page is inside the committed region or not. if yes, we mark the page with -1. There two loops here one for committed regions and for list of page numbers.
After loops, we check and expect that all the pages were marked as being inside committed regions.
|
Thank you @jdksjolen and @Arraying for your reviews. |
|
Going to push as commit 9eaa364.
Your commit was automatically rebased without conflicts. |
openjdk
bot
removed
ready
|
@afshin-zafari Pushed as commit 9eaa364. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
3 participants
In the test, page-numbers to be checked are passed to a checker function in which they will be changed to
-1if they are as expected.Use of these
-1values for page-numbers in consequent checks result in overflow in pointer arithmetic ofbase + (-1) * page_sizewhich is certainly less thanbase.The fix is to skip cases where page-number under checking is
-1.Tested under UBSAN build.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/28151/head:pull/28151$ git checkout pull/28151Update a local copy of the PR:
$ git checkout pull/28151$ git pull https://git.openjdk.org/jdk.git pull/28151/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 28151View PR using the GUI difftool:
$ git pr show -t 28151Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28151.diff
Using Webrev
Link to Webrev Comment